Added singleton implementation
Added singleton implementation