[Fix] issue #541
Refactoring
CS fix
CS fix
Merge pull request #543 from sescandell/fix-issue_541

[FIX] Allow to add "dynamic" fields from builder