Refactoring way to generate builders by parser.
little changes