Add support for multiple, mixed targets