Remove generics, just use plugin.