CP now uses keys
fixed other classes to use new hooks for keys