Updated db design

I have created an updated database design taking in the requirements of the module and opening up new functionality possibilities.