Use new generic class