- Plugin route got too complicated so I moved enhanced code into the core