Added personId and subjectId