Add Restangular
Improve map