Categoricals cleanup: New structure 'payload' which reduces the