Add fast session switching