Fix issue with CRUD system + Add better routes