Removed ExpansionStorage from plugin