Add generic type for 1.6 compatibility