Add <target> to remaining fields

Fixes #2