Containers changed to arrays