TD-3985 Address Complexity issues