update payload class to use proper getter/setters