Added from-file loader