Options refactoring in builder.rb