Improve cfopt