Moving more code to core.