Updated file context. Closes #346