Proper assignment of payload types