Done alot of more work. Now we support the old format modell with elegant caching of used format in a map for reuse.