Adjusted xcdr client logic to work better with bundle