Refactored Plugin-Services