Extended API to support new indexing and labels. Began schema annotation.