Added new class implementation for the map annotation