Further changes to add second generation schema.