Enhanced the DB