Adding more functionality, json, xml, html