Input parser added