Preparation to use contract groups in bvr generation