Adding RC3 - context can be passed in payload for API