Some parsing added