Consumer cleaned up and should be working with new architecture