Changes for client