Add geo domain
Refactor mappers logic, add Geo domain