Wrapped CB client in FSM, updated ID handling.