Added Sven-Singleton for Sprint 2.