Added saving of all other entities