Preporitory work on comming file resolution update