Move methods to manager