New classes after fixing some bugs