Added support for data control extensions.
Fixed line endings and formatting.