ITTE-1040 - Re Factored proxy task.