Preparing for new features