Updated routes for cleaner implementation