Added identifier parser