Move methods to helpers