Better integration with the CLF