More work on configuration