Modify to cope with record-types containing a hyphen. Add rules for services