Add calls to WorkflowController.getInstance() where necessary