Preparations for new version