Simplify internal API

By including the `subject_identifier` in assignment objects, the internal API can be simplified.