Added a couple of APIs and mapping services