Added EntityTarget struct Use EntityTarget struct instead of TargetName and TargetType Make EntityIOTargetType internal Move BuildTargets logic to EntityTarget struct