Updated db and some changes