added wrapper around data passed into handlers