Moved to new storage format.
Fixed dependency.