Added some more variables to alerts