Adding Service and Webapp features.