Better support for multi-file documents #6