Add generics to some models.
Merge pull request #111 from greboid/rawtypes

Add generics to some models.