TODO
Remove broken support for target enumeration