Change to use Lists.newArrayList