Updated generics on Feature