Improved models, variant consumer and changed the model names