enhance parser a bit