Further client updates