Updated to singleton instance form