Generics were added to the base logic