Added class for return