Refactoring new validation rules