Add some classes (missed in the last commit)