Improve C55x+ analysis