Fixed up field naming, ensured singleton behaviour for routers