Add some extra validations