More CRUD and user service improvements