First commit
Fixed singleton creation