Refactored marker creation
Closed #176