Add Generics from Oracle