Minor change on api
Prototype of new localization aware object mapper in the api
Fix bugs and improve object mapping in api