Improving Router and adding filters