Modules updated to work with new flow model
New statuses introduced: *_skipped
Cleanup