Changed scope to singleton