ENGINE feature: More robust parsing