Changing singleton usage