Move payload_method to individual class; extend appropriate class