Markers hierarchy is refactored (alpha)

 - Support for all markers is implemented.