Make some classes internal