plugin updated to support extend/restore