Add refactor for .Net mprovement