better support for multi file