Issue-234

Fixes #234 (closed)

Note: Once merged, all data load scripts should be re-run in order to ensure the database relationships are updated to reflect this change.