Validation fixed for all attributes