Extended parser added