Updated to include client