add better mapping for format