Wild card import fixes in Workflow