Don't use the top-level keys, use newer nested ones
Merge pull request #120 from ZeroFucks/top-level-payload-keys

Don't use the top-level keys, use newer nested ones