Use List instead of ArrayList