Improved POD markup