Added support for forcing values to match against the db