Fixed client CRUD