Fixed validation with methods