- fix missing classes

This should fix my previous (broken) commit. No idea why these classes were not committed as well last time...