Added Mexico CAP data. Refactored main parser.