Inlining some classes