Move more functionality into cube.core.