Add remaining state fields to retriever structure.