Enhance Hook feature - refs BT#9092