Updated Diamond Client Handler