Move methods to before validation