Added routematcher and updated the loader.