updated to add NOT NULL to generic info table