.NET model changes + init changes