Convert Consumers to the new architecture