Added those new classes!