Add assembling to router and generic route