Added support for flash messages