Hook architecture tweaks