Updated JS grammar