Improved payload loading