Add some missing classes

WIP