refs #11688: updated DB structure