refactor[ddbnext-8]