fix: Add conditional to hook class template to prevent double declaration issues
fix: Remove reference from signatures.