Improve working with multiple files