Add better support for formats, w/ explicit validation / enumeration of accepted formats