Net runtime optimization (21/26)

Net runtime optimization