Begin to expand the schema a bit