Change more sources for singleton pattern