Decouple the servlet plugin from the core