Updated subjects and added subject unit

- Updated subjects
- Added parent unit