Add support for all result states