Added LOGOUT support