Compatibility with new parser