Fix the transformation, Configure table storage
merge conflicts