Updated to new array list architecture