Add client to device_hierarcy

Put scopes in utils?