Use new attribute storage plugin