Update database

Add major updates to tables based on whiteboard discussion between
Joel and Jacob.