Added structure.sql changes (still for part1)