[WIP] Add custom file resolver