Replaced the parsing part with the new, smarter one