Base schema changes and code for split data.