Added class stuff