Finally fixed issue with generics!!