Made some classes and functions public so that FrameFactory can use them