Use array for database fields

Also reuse a existing database object

Change-Id: I42cc0636b25ba6266ab37ce0a7422e5863edf741