Added mapping for json formatting