model helper generics fixed