Changed ExpansionStore to ExpansionStorage