Better support for loading different files