rules engine enhancements