Shall we put the mapping I mentioned below to the deprecation message?