Refine fetch config
Rename file
Add some utilities