Add many similar classes, small change in Storage class.