extracted from jar and fixed generic references to types