Added better builder with linter.