Changed to ArrayList to allow adds