Add support for more checkout events