Started adding stuff to support dynamic payloads.