Feature/map objects