Deprecate singleton factory method