Improved generics of some class.
Merge pull request #165 from carme-264pp/improve-generics-support

Improved generics of some class.