Adjusted to latest store interface changes.