removed HList dependency