added identifier parsing