added a history and location mapper and service