More additions to producers, retailers, and removing store class