Fixed validation rules classes