Finish file support for collect. references #2132