Updated SharedInstance method