* Adapted services to return promises
* Added map directive to be used for all future map renderings