Updated ws-fed pluging to new DI system (still needs some work)