Using a more generic data parser. Fixes MAM tests.