Added support for additional fields to be saved into the database.