Support latest leo_storage