Added class framework