Added support for the uid.  Next to save the database and the records.