Fix payload argument and include value field