Add generators
Change dependencies