Added class solution