Added flash message support