Cleaned up DatabaseBase constructor to use an array

Change-Id: I094185585dc844ca4d2d8b629107b2ab8f9bef39
Merge "Cleaned up DatabaseBase constructor to use an array"