Updated filepath formats