Changed ArrayList declarations to Lists