Move more operators to Kernel