Payload refactor

Just to trigger CI