Added handling for identity fields.  Corrected transaction handling.