refactoring payload claims