Rearchitecturing: add file queue