#227 Refactored regions and markers to the separate classes