Upgraded database schematic, should be so much easier to develop from here on