Add Interfaces and part of Collections/Generics