Added functionality to parse input parameters