Added JSON based routing