Refactor
Add metrics for resources loading