update classes and RBOP strategy