Merged LabeledMarker into Marker. Some code refactoring