Make payload methods more sunsicnt