HG-838

Split domain out from rules to reduce eclipse problems