Add more fields to parser