Fix for Db/Model and Db/ModelFactory