Work on HBRule

Minor Enhancements