Improved handling for deferred formats