Moving formats to optionals.

Moving formats to optionals.

**NOTE** This PR is really a delta on top of PR #7.