Update for additional hooks and globals