Updated to non static List