I should mention that the consumers are in other teams so I can't change them so easily