Preparations for future updates