Change format to match internal man format 2.0.0