Changed Arraylists to List<>