Hack for lack of file/session handling