Improve post parser