Refactor to TargetType