Add classes and typedefs