Updates for better handling in client mode