Added expansion storage back into plugin