Added file load/unload capability