Fix indexing
Update specs to reflect API changes