Updated the database structure and also fixed delete list.