Refactored system service into Service library