Add support for .file and .loc