Work on hooking in Key header support