Audited and adjusted all db class methods