Shaf/TomW: update stub data with new enum values