Handle Unified Formats

I think this is used by previous long form or short form integration. Will double check.