Working on homologation process and refactoring to try and simply generation process