BZ-DRL-to-RuleModel marshalling improvements