Change singleton creation