Change of ClientCode convention