Switched over to new parsing approach