Change package level variable to instance variable of new parser type