Feature/support map fragment