Support for non-standard formats.

Forgot to include existing formats.  Integration tests include new
format.