Add some advanced stuff in router