added mapping info
added json return
added map element