Change interface so that different formats are more easily handled