Updated Map and DB stuff