DataLayer (MarkersLayer) refactoring