some changes for DB