JS enhancements