Output scheme revision

Merging latest changes of the output scheme revision.