Updated views to use token arrays