Update to new configuration styles