Issue #45. Validation rules updated