Refactor payload