Updated file paths and removed schema ambiguity