Improved Routing and added findbyid method to Repository