Changed routing and config functionality