Add support for targets
Remove condition