improved generics on combiner and fixed project scm