Add tag mapping
Remove tag number getter
Fix syntax errors
Propagate parsed fields