Improved the hook system to be expandable.