Added some stuff to analyzer