Slightly imroved saving and loading class diagarms