CHAINSAW-1: Add generics
66 files changed