Added system fields and cleaned up the parser.