Refined the router - now has default actions