Add missing validations for map