Started: Adding :consumer_class_id