Logout support added