record refactor
response refactor
table refactor