Added ArrayList and Junix imports