Update string identifiers
Add missing DB var