Add client to device_hierarcy

@sfro fixed.