Switched string/array back to classes.