Updated Map Class