Additions to FileResolver to support new tasks