Removed old code
Added custom match-route directive