Added mapping to output format