Move methods to Utils class