Restructure saving
Use object IDs