Improve C-L mapping