replaced direct variable structs in constraints witht DBVariable objects