Added generic types