A little more work on the file plugin