Set of proxies now doesn't break
Improved TODO