Fixes #61 - added data to handler that gets copied to contexts