Class changes ast and parser

Changed variable type structure