Update to work without JsonP