Little changess in builder.js