Added empty value checks for Payload classes