Added a more efficient parsing option