Updated Maps to include everything