Corrected generic type