Updated to the correct types the client requested