Configuration updates

Some improvements ready for configuration work.