added some changes in DataBase and Request