Reworking Reqs to use Rules for genericability