Restructured the Market Class