Added dynamic product classes and deleted not general classes