Improved generators

Separated fragment into its own generator