Adapted for new storage scheme