Tweaked spec to include message indexes