Add better parser output