Adding some stuff to handle javascript syntax