added shape parsing.