Done with planned changes for 2.0