Bug 2559 Added primary keys to tables per comments