Markers refactoring