Added Service classes and Bundles