Changes to the Data

Made Changes to the Data model

Signed-off-by: Frank McAuley <frank.mcauley@gmail.com>