Final changes before release 2.0 update