Updated for CM 7.0 and some AG 7.0 docs