Map position refactor