Change arrays/collections lib to java.util