Implement changes to rule-handler necessary for entity-initializer