Updated to reflect upstream database API stream.