Updated to include configuration.