Better marker handling