Updated to represent new jsxd return values.
Moved remaining data to jsxd.