Better parsing support