Change more sources fo singleton pattern