Changed route name convention to /:resource/:id, added /:resource/:id/:collection