Adding in explicit queries for files