Pass the modification payloads to the right handler

Fixes #769