Updated the rules to work with the ++framework++ setup