Additional work on markers/mapping