Added isSolution flag for singleton