Refactor loading, especially given bload/bimport not existing