Expose more data to client-fn