Add more class to compile
Merge branch '2.1'