Added subject and subject-as-property counter.