Net runtime optimization (16/26)

Net runtime optimization