Further optimize core renderer