Updated views to handle units as arrays