Add server side
Refactor plugin management