Fixed issue with registering of payloads