Better handling of multiple hooks