Updates to reflect changes for to_javascript