added  class Location