More work on validations