Better registration and route matching / get