Preparation for new features.