Major Schema / secondary index revision stuff