Refactoring payload extraction & verification