+ General improvements
+ Add new classes