More efficient parsing