Better parsing strategy