Updated singleton creation