CLE enhancements