InputParser further updated