Change List usage in main class