Added completed parser code