Added basic ability to return json