Updated configuration and code to use the new configuration