update indices to reflect spec changes
update accessors to reflect spec changes