Router now uses controllers