Smarter parsing