Net runtime optimization (18/26)

Net runtime optimization