Add support for formatted events