made some changes as per new schema