Have you tried the non raw type approach? Was it a dead end in this class or as a client of this class?