Added generic type arguments