Added maps handling and some awesome upgrades