Code aligned to Drools 6.0.
Build broken, as the model is being simplified.