Removed squashed methods and relaxed constraints on method overloading
Make the generator configuration a bit more flexible