More work on file loader