Include documentstore as well.