Added new markers and implemented static function to load them.
Solved conflicts