User CRUD and some other improvements