More types & removed generated files.