Updated new classes