Start of adding RAPID generated client.