Updated to store extended classes