Minor changes to allow for multiple payloads