Improving CLLD implementation