Improvements in validations