changes in rule_engine and activity model