Update models and APIs to work with Workflow API