even more use-case & CRUD updates