Added amenity schema validation