Refactored & introduced 'Marker' class