Changed all templates to use array instead of objects.