Updated maps functionality