Added Service and Metric Scaffold