More on saving entities