Switch to v0.4 matching