Added new parsing logic