Js enhancements