Modifying for DB