Fix storage and instance class bug