Added new classes and forms