Partial implementation of workflow scheme
Minor renames