rename hadoop-compatibility,
more generics