Improved format support