update to be compatible with .net refactoring