Feature/config provider improvements