updated the design - added & renamed tables