Update adding plan city, country, type; separate stay and transportation