Move onPreResponse
Changes for vendor routes
Changes for plugin loading