Added logout support