Switching from "options.data" to new "metadata" event.
A couple of corrections about my previous commit.