Preparing for further deprecation