Move more code to manager