Replaced parameterized type by Class instance

https://github.com/kfgodel/diamond/issues/15