Added several new classes