Making changes in number classes to maintain compatibility with 2.1 applications