Re-designed data model according to feedback received from Dr. Thusith Gunawardane