Upcoming changes for 1.1