Improved internal format