More preparations for version 2.2