Updated to use generic DB record class