Add support for target suffixes