Add missing classes to previous commit...

Maybe I should use gerrit...
2 files changed