changes to overcome type limitation with v1 router