Updated Workflows to use more drools