Updated to add subject data