Adding support for dynamic route