Changed validation - refactoring