Refactor Domain Model to Extension Methods