New parser with simplified code