Added two new classes
Some bug