Added more amenity types.