Added some title to the CRUD options
Changed interface
Small refactor