Move methods to utils