Switching to use strings instead of arrays for performance