Improved save support to actually get back the primary key.