Preparing for future changes