Polished C# API and keep references around