object mapper added and simplified json export