Moving formats to optionals.

Moving formats to optionals.