Enhanced API and JS