Updated to fix archiving error with user states