added class Location and Event