Added support for loading from files