Improved PEG support