Added Singleton and webapp