Fixed plan import.
Added Workflow support