API improvements, wrapping event data properly.