Fixed generics usage

This eliminates IDE warnings