[DROOLS-64] Trait Performance and fixes