Made the API more list oriented in the success path.