Fix bug and define default workflow
Change to using workflows utility