Fix :: Add generalized code in router