Update metrics
Fix loaders