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

[Fix] issue #541
Refactoring