Modifications to support providing tag descriptors from derived hosts

Personal preference to put params with `[NotNull]` on separate lines