Support RM 2.0.x