Improved routing

Todo: something special if route not found and no default