File resolution improvements