Added singleton
Added singleton