More accurate parsing