Updated db schema. 4-17 was BROKEN