Improved support for subfiles