Reorganzied to be able to parse multiple formats
Reorganzied to be able to parse multiple formats