Switched from direct ArrayList use to guava Lists