Refactored the repository
Added a method to retrieve the URI from the model
Changed the Menu to respect the latest changes