File loading changes