Adapted to new storage scheme