Better origin/source file parsing