Added setter to PlaceLocation class
Fixed merge issues
Use class PlaceLocation instead of array