2.0 branch new classes