Add more hooks to allow filtering types.