Net runtime optimization (23/26)

Net runtime optimization