More work on the config