Added Amenity annotation class. Minor refactoring.