Minor adaptation, will migrate to json formating slowly