Checkpoint

Index and ExpandoAdapter improvements