Made Changes for DB