Removed unnecessarily generics