Edited UML for new Singleton layout