Refactor payload spec