Added class pair and some code in other classes