Preparation for future updates