Finished SaveData support for entities