Make the generic class work..