Improve Hook class