ASP NET client refactor