Added generics support

[UnAfraid]

As the title says, added generics support instead of the interface{}