Change work data to be an Option