No more this here, it is no longer generic