JS structure update, updated index semantics