Added extra field support in the "database".