Avoid using raw types.

The usage of raw types for type parameterized
classes makes it difficult to use the library
from Scala