Made several changes in More CRUD checkpoint