CarstenAgerskov Support for internal format added