Fixed CRUD and push problem