More CRUD Bloc Code
Merge branch 'code-fixes'