Dedicated targets

Supersedes pull request #983.