Allow overriding of old hooks