Make multiple entity lookups more efficient and ensure entities are all saved using 'save' rather than 'create' or 'update'