Improved generators and implemented model generator.