Added rule-based training data enhancements