Added various new classes and features