bulk out the schema a bit