Adding better support for JS