Updated phql parser