Change markers to dict rather than list