Add the missing ones (and test the hook)