add zones table and add NOT NULL etc.