Added TODO items for replacing with new unified Hooker