Version bump
Extracting validations to Validator