Added TARGET to enable the client to work with CHMI/EHMI (tests still ongoing but basic stuff seems ok)