Changing typedefs to using. Still not working even with the wrapper for the payload