Change config structure - put params in a container