Refactor: added some classes which could inherit MapObject