Added singleton partten