Dispatcher now parsing routes properly