Add missing generics to Router stages (in options)

Add missing generics to Router stages (in options) #194