Direct call to builder.map instead of iterating the properties
Merge pull request #1 from xenji/simplify-builder-op

Direct call to builder.map instead of iterating the properties