Add missing functions
Replace javascript interop