Moved validations into validator