Input parsing added